add a set of apis to configure wasi-nn via InstantiationArgs2 by zhanheng1 · Pull Request #4764 · bytecodealliance/wasm-micro-runtime

zhanheng1 · 2025-12-19T06:53:45Z

add a set of apis to configure wasi-nn via InstantiationArgs2:

Add a new command line option for wasi-nn: --wasi-nn-graph=encoding:target:model_path1:model_path2:...:model_pathN;
Add new structs to manage this cmd option: WASINNGlobalContext and wasi_nn_graph_registry;
Add 2 new parameters for load_by_name(encoding and target). load_by_name() can get encoding and target from WASINNGlobalContext and set into backend.
Update test codes.

core/iwasm/common/wasm_runtime_common.c

core/iwasm/libraries/wasi-nn/include/wasi_nn_types.h

core/iwasm/libraries/wasi-nn/src/wasi_nn_backend.h

core/iwasm/include/wasm_export.h

core/iwasm/common/wasm_runtime_common.h

core/iwasm/libraries/wasi-nn/src/wasi_nn.c

product-mini/platforms/posix/main.c

…nd simpler

core/iwasm/common/wasm_runtime_common.c

core/iwasm/common/wasm_runtime_common.h

core/iwasm/libraries/wasi-nn/src/wasi_nn_backend.h

yamt · 2026-02-05T02:23:02Z

core/iwasm/libraries/wasi-nn/include/wasi_ephemeral_nn.h

 #include "wasi_nn.h"
-
-#undef WASM_ENABLE_WASI_EPHEMERAL_NN
-#undef WASI_NN_NAME


In wasi_ephemeral_nn.h, macros are defined and then wasi_nn.h is included immediately after, but these macro definitions are later undefined (#undef). This means that in utils.h, the macros might be in an undefined state, leading to compilation errors( if WASM_ENABLE_WASI_EPHEMERAL_NN != 0).

wasi_ephemeral_nn.h header is meant to be used by applications which uses this version of api.
these macros are not meant to be used by applications. (WASM_ENABLE_WASI_EPHEMERAL_NN, WASI_NN_NAME, WASI_NN_ERROR_TYPE, etc)
they are supposed to use eg. wasi_ephemeral_nn_error.
see samples like wamr-wasi-extensions/samples/nn-cli/main.c

core/iwasm/include/wasm_export.h

core/iwasm/common/wasm_runtime_common.c

core/iwasm/libraries/wasi-nn/src/wasi_nn.c

core/iwasm/interpreter/wasm_runtime.c

…RROR_TYPE"

… named WASINNRegistry. Replace malloc/free to wasm_runtime_malloc/_free, replace strdup to bh_strdup.

…a common logic.

yamt · 2026-03-03T04:14:22Z

core/iwasm/libraries/wasi-nn/test/build.sh

 /opt/wasi-sdk/bin/clang \
    --target=wasm32-wasi \
+    -DWASM_ENABLE_WASI_NN=1 \
+    -DWASM_ENABLE_WASI_EPHEMERAL_NN=1 \


why do you enable WASM_ENABLE_WASI_EPHEMERAL_NN for this, but not for test_tensorflow_quantized.c the below?

have you run these tests at all?
if not, i'd suggest to leave these to use the legacy api for now.

why do you enable WASM_ENABLE_WASI_EPHEMERAL_NN for this, but not for test_tensorflow_quantized.c the below?

Just forgot to enable them for test_tensorflow_quantized.c, thanks.

have you run these tests at all?

Yes, I have tested them all with WASM_ENABLE_WASI_EPHEMERAL_NN enabled.

yamt · 2026-03-03T04:21:09Z

core/iwasm/common/wasm_runtime_common.h

+                                       const uint32_t **encoding,
+                                       const uint32_t **target,
+                                       uint32_t n_graphs,
+                                       const char **graph_paths);


i suppose these should be in wasm_export.h as it's used by the embedding applications like iwasm.

yamt · 2026-03-03T04:22:57Z

core/iwasm/include/wasm_export.h

+
+WASM_RUNTIME_API_EXTERN void
+wasm_runtime_set_wasi_nn_registry(wasm_module_inst_t module_inst,
+                                  struct WASINNRegistry *wasi_ctx);


wasm_runtime_get_wasi_nn_registry/wasm_runtime_set_wasi_nn_registry are not supposed to be used by applications, are they?
i guess they should not be in wasm_export.h.

in wasm_export.h, put only api which is used directly by application. (eg. iwasm)
internal api should go to somewhere else, like wasm_runtime_common.h

yamt · 2026-03-03T04:24:14Z

core/iwasm/common/wasm_runtime_common.h

+
+WASM_RUNTIME_API_EXTERN void
+wasm_runtime_set_wasi_nn_registry(WASMModuleInstanceCommon *module_inst_comm,
+                                  WASINNRegistry *wasi_nn_ctx);


two duplicated wasm_runtime_set_wasi_nn_registry prototypes in this file.

yamt · 2026-03-03T04:28:09Z

product-mini/platforms/posix/main.c


+#if WASM_ENABLE_WASI_NN != 0 || WASM_ENABLE_WASI_EPHEMERAL_NN != 0
+    wasm_runtime_wasi_nn_registry_create(&nn_registry);
+    wasi_nn_set_init_args(inst_args, nn_registry, &wasi_nn_parse_ctx);


wasi_nn_set_init_args vs inst_args look a bit confusing.
maybe you meant wasi_nn_set_inst_args?

QiuYuan Han and others added 8 commits December 19, 2025 15:06

Add the way to set the target evenif we use load_by_name

96cdfa6

Add a new error check for wasi_nn_load_by_name

60a8011

Use clang-format-18 to format source files

6dc9d01

Free model_name

d42581b

Add new errno for new test cases

1cca0b8

Fix bugs

9e03970

Rename some parameters

cd1c7f9

Revert tensorflow version

c73e4aa

zhanheng1 force-pushed the InstantiationArgs2-wasinn branch from 77794ae to c73e4aa Compare December 19, 2025 07:07

zhanheng1 marked this pull request as ready for review December 23, 2025 01:52

zhanheng1 requested review from TianlongLiang, loganek, lum1n0us, no1wudi and yamt as code owners December 23, 2025 01:52

CICD: retrigger checks

0234fe0

yamt reviewed Jan 21, 2026

View reviewed changes

zhanheng1 added 8 commits January 26, 2026 11:23

Remove internal function declarations from wasm_export.h

4b93110

Move wasi_nn parameters parse logic into libc_wasi.c

6bc7512

Allow multiple --wasi-nn-graphs

12d8a18

Use clang-format-18 to format files

8dbba46

CICD: retrigger checks

c024c94

Add model_name option for --wasi-nn-graphs to make it more flexible a…

736f357

…nd simpler

Add help info for wasi-nn test wasm

878c8ec

CICD: retrigger checks

c43fbeb

yamt reviewed Feb 5, 2026

View reviewed changes

zhanheng1 added 4 commits February 5, 2026 14:29

Use a specific error type wasi_nn_error_t instead of macro "WASI_NN_E…

6501e4b

…RROR_TYPE"

Unify WASINNGlobalContext and WASINNArguments into a single structure…

b122451

… named WASINNRegistry. Replace malloc/free to wasm_runtime_malloc/_free, replace strdup to bh_strdup.

Check integer overflow for wasm_runtime_wasi_nn_registry_set_args

a85079a

Remove strdup in wasi_nn_parse

7b62ec8

zhanheng1 added 7 commits February 5, 2026 17:37

Remove "encoding" for load_by_name

01641bf

Remove some internal functions used by wasi-nn from wasm_export.h

eb55c28

Removed unnecessary conditional checks.

ccee194

Move the error checks to an earlier stage.

5357fb5

Use clang-format-18 to format source file

4747d61

Make wasi_nn_load_by_name and wasi_nn_load_by_name_with_config share …

9e89828

…a common logic.

Fix compilation errors for nuttx platform.

7822544

yamt reviewed Mar 3, 2026

View reviewed changes

Conversation

zhanheng1 commented Dec 19, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yamt Feb 5, 2026

Choose a reason for hiding this comment

Uh oh!

zhanheng1 Feb 5, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

yamt Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yamt Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

zhanheng1 Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

yamt Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

yamt Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

yamt Mar 3, 2026

Choose a reason for hiding this comment

Uh oh!

yamt Mar 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

zhanheng1 Feb 5, 2026 •

edited

Loading

yamt Mar 3, 2026 •

edited

Loading